From 224822c831207e2251ea1fb49f35656c933658fd Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 16 Sep 2013 18:38:15 -0400 Subject: [PATCH] wayland: Make the code here a bit clearer By grouping the destroy and field clear together. --- gdk/wayland/gdkwindow-wayland.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 6fdbc77922..26afb1f98d 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1101,8 +1101,6 @@ gdk_wayland_window_hide_surface (GdkWindow *window, if (impl->surface) { - if (impl->shell_surface) - wl_shell_surface_destroy (impl->shell_surface); if (impl->use_custom_surface && !is_destroy) { wl_surface_attach (impl->surface, NULL, 0, 0); @@ -1120,7 +1118,13 @@ gdk_wayland_window_hide_surface (GdkWindow *window, g_slist_free (impl->outputs); impl->outputs = NULL; } - impl->shell_surface = NULL; + + if (impl->shell_surface) + { + wl_shell_surface_destroy (impl->shell_surface); + impl->shell_surface = NULL; + } + cairo_surface_destroy (impl->server_surface); impl->server_surface = NULL; } -- 2.30.2